Skip to content

update package deps for custom project root #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

update package deps for custom project root #1412

wants to merge 3 commits into from
+17 −7

Conversation

vanvoorden
Copy link
Contributor

@vanvoorden vanvoorden commented Jul 9, 2025 •
edited
Loading

One small improvement to package manifest:

  • We follow the pattern from swift-corelibs-foundation1 to compute the location of dependencies:
    • SWIFTCI_USE_LOCAL_DEPS=1 moves us up one directory when looking for dependencies.
    • Missing or empty SWIFTCI_USE_LOCAL_DEPS pulls dependencies from GitHub.

Tested locally from my machine:

$ cd ~/Developer/swift-foundation
$ swift build
...
Build complete!

$ SWIFTCI_USE_LOCAL_DEPS=~/Developer swift build
...
Build complete!

$ SWIFTCI_USE_LOCAL_DEPS=~ swift build
...
error: the package at '/Users/rick/swift-collections' cannot be accessed (Error Domain=NSCocoaErrorDomain Code=260 "The folder “swift-collections” doesn’t exist." UserInfo={NSUserStringVariant=(
    Folder
), NSFilePath=/Users/rick/swift-collections, NSURL=file:///Users/rick/swift-collections, NSUnderlyingError=0x6000020b0e40 {Error Domain=NSOSStatusErrorDomain Code=-43 "fnfErr: File not found"}})
error: ExitCode(rawValue: 1)

Footnotes

  1. https://github.com/swiftlang/swift-corelibs-foundation/blob/swift-6.1.2-RELEASE/Package.swift#L155-L181 ↩

@vanvoorden
Copy link
Contributor Author

https://github.com/swiftlang/swift/blob/swift-6.1.2-RELEASE/utils/swift_build_support/swift_build_support/products/swiftfoundationtests.py#L83

@jmschonfeld I found one place we run swift-foundation tests with SWIFTCI_USE_LOCAL_DEPS=1… can you think of any place we are trying to run swift-foundation tests with some arbitrary custom SWIFTCI_USE_LOCAL_DEPS=path? Or could you think of any more places this change might lead to problems?

@jmschonfeld
Copy link
Contributor

@swift-ci please test

@jmschonfeld
Copy link
Contributor

https://github.com/swiftlang/swift/blob/swift-6.1.2-RELEASE/utils/swift_build_support/swift_build_support/products/swiftfoundationtests.py#L83

@jmschonfeld I found one place we run swift-foundation tests with SWIFTCI_USE_LOCAL_DEPS=1… can you think of any place we are trying to run swift-foundation tests with some arbitrary custom SWIFTCI_USE_LOCAL_DEPS=path? Or could you think of any more places this change might lead to problems?

All of our automated testing should be using SWIFTCI_USE_LOCAL_DEPS=1 - that's what build.ps1 does for Windows CI and what that python file does for Linux CI. The ability to specify a path instead was something we just introduced for benchmarks so I don't think there's anything concrete that provides that today (aside from providing it via the command line locally itself)

jmschonfeld
jmschonfeld reviewed Jul 21, 2025
View reviewed changes
Package.swift Outdated
[
.package(
url: "https://github.com/apple/swift-collections",
from: "1.1.0"),
branch: "main"),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We actually want to keep this at 1.1.0 instead of main since these versions should match what we use for building the toolchain. When building the swift toolchain, the build script builds against swift-syntax and swift-foundation-icu's main branch, but it builds against a tag of swift-collections since that package is developed outside of the toolchain and tagged every so often. When building a toolchain, this JSON file determines what is checked out: https://github.com/swiftlang/swift/blob/3bacfa7fb974e89ad7278f727ccd54a6643b87b6/utils/update_checkout/update-checkout-config.json#L142 (i.e. it determines what branch/tag is checked out and then specified via SWIFTCI_USE_LOCAL_DEPS when running in CI) so ideally these dependencies (for local package development outside of the toolchain) will use the same-ish dependencies

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jmschonfeld Ahh… interesting! I can change this back. Is the idea to keep this version here and the version from update-checkout-config.json bound together manually? We don't have any easy way to keep that version defined in just one place and then queried dynamically?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this all then imply that we don't currently have a Foundation CI job that builds against the main commit on Swift-Collections? If in theory a bad commit did land on Collections that broke something in Foundation we might not know about it until Collections pushes a new version tag?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jmschonfeld jmschonfeld jmschonfeld left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@vanvoorden @jmschonfeld